bugfix, onFinish