Code was improved for support feature request #6