Issue with Persistent Context when using q-gate