Lazy

Try to fix Pierrick's PR.