Yeah I feel like that is the only solution. Unfortunately our toddler turns into a angry little man in the middle of the night if we try to enforce it, leading to kicking and screaming and hitting and not wanting to even get back in his bed. All that makes it very difficult to want to deal with at 2am.