Fixed secondary key problem