fixes to work with robot