fixed BAD_REDEFINE1