Logical fix with selections