Fix time calculation
Merge branch 'fix-freeze-ban-issue'