This should fix the problem mentioned in !46 (merged).
This will create a new commit in order to revert the existing changes.
