try to get session type matching right again