Put back the session checking on Master