Fix Crash at lunch time