Fixed issues with timing thread