Merge pull request #1776 from evincarofautumn/fix-independent-sgen