Fix #7
Fix Sort Method