Fix crash on startup

This fixes the crash that is the source of the currently open issue