Fix bug regarding timezone