Fix for EDGE-3737

Fix for EDGE-3737