Input Validation Fix