(#) Fixed issues with time and time offset