Fix (and clean) last commit