Workaround when time-travel bug occurs
Merge pull request #4 from archangdcc/avalon4

Workaround when time-travel bug occurs. Thanks Archang