fix some behavior