fix for GCOD-510