[#1033] Use block on if statement