fix and session cases