Updated for removal of a bracket into 3.10.17