Readded the finish condition