Resolve issue #3909 (provided by user Clupiedae)
Merge pull request #3968 from cautionbug/master

Resolve issue #3909 (provided by user Clupiedae)