fix for GCOD-469