Bug fix for issue #12, no input