Issue #86 - Fix expanding timezone into the future