Previous fix was hurried, and only fix one of the
possible cases. Found the real cause and fixed it.

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