And finally fix #3

Testing is needed, though.

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>