fixes bug that ignored session context