Fix for :finished mode