Fixing default values see BT#8960