Ported combined input for fixing #2