Fix #99

This PR fixes #99 (in combinaison with: ef4a8ea1b6c4dfb9a84b5c2a3c933f2d6481814e).

I'll add test for it.