fixed default code with removing "_"