Fixed #1 sort of