Bug Fix EndPoint Validator