Fix for #4536

Currently using the GitHub Desktop App,time to see if I did it right; if
any side effects happened.