adapted to work with sesame 2.6.9