Fixing startup crash.