Fixed name and draw issue