AUTO-574

Fix for AUTO-574