fix some runtime behavior