fix issue when TZ / native datetime used