Multi-input bug fix