fix hold and import issue

as describe in
https://docs.google.com/document/d/1tOSnzFPpt20p7AvKFRJntWmClcooWcKf4MgVxZz9d4k/edit