Fix for order paremeter. h/t @mjangda