fixed issue with finish call