Fixing Problem-Session decoupling.