Fix to generators