Fix for generation in FF