Fixed EDGE-4002

Fix for EDGE-4002