0f943a6 fixed sorting issues