Fixed timing bug
Merge