I've been thinking about this too - it's what I do now. Seems a bit stupid to duplicate the keys once again, but if it's the only way to ensure the correct order...

Thanks!