do-enter fix + ref.