fix 4.1 code