Fixed issues with the fix timing function