Fixing 1742 Timing issues