Fixed issues with time pulling