fixed redefine error