re #9096 - simplification of time check