Hopefully fixing #4905 #4937