Bug fix Time zone