Fix simple mode lifecycle gap