fix for GCOD-567