Fix sort messages