Fixing select issue