Fixed mangling with keyset problem