fix for GCOD-479