Messy hack to fix default sorting