Fix timezone offset bug