@alexrothenberg @davidcelis thanks, I have added fixes