looks like it is working

commit 2a20d2fd99c809803a6250c69a6b6b90f9502175 is the final one

thanks