Valdiation bug fix