Added generator hack from IPA-BNM