Fix zone conversion java -> db -> java