Loup => Fixes #5