more de-mangling