Fix timezone confusion bug