Fixed the crash for real now