Fixed bug with sorting...