Optimized code from the previous map time fix.