Fixed timezone naive bug