This should fix #1.
I was not able to test the modification.
This will create a new commit in order to revert the existing changes.
