fixes #18

I hope the last PR for this issue !!