Fix generators