To support the UX feature in #12
To support the UX feature in #12