20141031: Fixed sorting issue with some mappy magic t(-_-t)