R7_US02_General Bug fixing
Fixing the generator init to do some castings