Fix time zone issues (#63 again)