fix generation stuff