Fix sessions breaking