Resolve #199 again

grumble grumble grumble