Bug fix: Revise timezone function