Could you please send a new patch to improve that ? Thanks!