Sessions were broken due to wrong check and addopts were not preserved