Bugfix, sort working