Fixed more in Generator Helper