Merge pull request #1 from Baystation12/master

Updating fork
Fix for #4536

Currently using the GitHub Desktop App,time to see if I did it right; if
any side effects happened.
Merge pull request #4656 from Jarcolr/master

Fixes #4536