see if this solves the order bug