fix 42 and 43