Bug-fix: skip take order works fine