Fix #10 - Fix up sort order bug on context switch