Draft: Resolve "Input bugfix"

Nikolai Arbuzov requested to merge 73-input-bugfix into master

Closes #73

Merge request reports