Moved canonicalisation inside solveInteract