Fixing an important bug on timing