Fixed issue with grid layer displaying at incorrect times