Fixed redefinition warning