Fix for Time zone issues #5