Generator fix