Re-enable sorting fix