Hotfix: Gain optimization