Proper fix for timezoned dates