fix error with vanilla 2.1.x