checkpoint, note FIXME problem with session scope