Issue: #142 - Fix for @if error