Revert "Fixes #617 : is this enough to fix ?"

This reverts commit 14bd0681bfafd99f387c9d5b4331d9a8dee4fd79.