Tried to fix redefinitions.