Fixed failing order completion