Hotfix for GENOA-30