hacked around some input issues