*8445* Fixed default behavior