Should fix #1265
Should fix other issues on start.