Fix donut input bugs

Issues: fixes #1551  fixes #1529