fixed: incorrect timestamp calculation in _cleanup()