Fixed timezones not being persisted when generating timestamps