Addressing session controller bug