Fixed date zone conversion issue