LPS-33647 Altered handling of terminal states in Definition