Fix select method