Generator Fix