fixed 3.18 code