Fix for DMON-10
Fix for issue MPEN-77