Fix for timing issues - 4.4.3