better handling of thief/loaf/leaf