Fix select operation