diagnosis hacks; remove before merge XXX