Merge pull request #571 from ariard/2020-04-fix-minimalif