Fix silly mistake. Add more input support.