fixes 1.6 issue