Fixed issue with timing