Solves the sort problem from 29/04/14