Security fix see BT#7741