add somes fix from @adrienbrault