Order v1.1.1 bug fix