Possible select fix