Fix input validation again
Merge pull request #10 from user2509848/patch-8

Fix input validation again