fixed timezone related bug