this helps to solve issue #6

but it doesn't not solve issue 4 :/