fixed names issue