Fix hotfix_start and hotfix_finish