Changed the order limit to fix remaining issues