(master) fixing syntax validation errors