Hack to fix change to sortkey option values