tries to solve NB#66463, I am not sure if this is enough