fixed lack of 'order' bug