Removed inline if statement that would break things...