Fix for GCOD-681