try to fix peon bugs