Fixed conflict with session manager