fixed recent mandril changes