Expert sort fix