Attempting to fix generation again