input fix
Merge remote-tracking branch 'github/friseb'