-finish previous fix - didn't change all cases