partial fix for GCOD-478