fixed: duplicate name issue