fix
session safe or not