Fixing wrong conditional #3