Fix for GCOD-119