Fixed up finish hack logic