Execution time bug fix