Fixed issue that would cause a crash on start