Made case-sensitivity consistent with the FS