fix for GCOD-459