Fix custom select