18 jer fixes