Fixed some generated duplication