Draft: Resolve "Input bugfix"

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

Closes #45

Merge request reports