Fixing reporting see BT#7297