Tried to fix sorting