Mangle the key a bit more
Return value fix