Fixed Bug on Validation