Fix for timing