Merge pull  from Nawuko/vincent-fix