Code fix after Validator check