Fix order identification in multiple instances