Added sorting fix.