Fill rule misunderstanding

Rebased and repulled #1688