Fix for select_and_fix