fix some issues 1