Fix single selection function