You need to remove this to be in its own if clause