Merge pull request #1927 from Particular/fix-1925

Relates to #1925