feature/hotfix_finish_more_lenient