There is no way to avoid it at the moment, but eventually all the scenes will be avoidable. We just didn't rework the older ones yet.
Thanks for the response! Good to hear!
