Fix for negative ordering