jira/NMS-6800

This fixes issue NMS-6800.

Please review...