Remove redefinition (issue #233)