Simplified the if statement for the last commit. What was I thinking?