[#31] Conditional removed from finish method