Fix for bug #113 Conditional statements conflict with parameterizations