rougier Manual fix from PR#16 (to avoid conflicts)