Fixes select bug