Fixed redefinition bug