Hibernate: Take overlapping zones into account (rev. 2)