Updated to fix startup problem

This is fixing the startup problem completely for me, maybe it helps others too.