Fixes bad us of return in a block