Fixing BT#7414