Attempt at fixing select issue