Fixed sorting layer again