Properly implement 62649776ca
Merge pull request #637 from Slayer95/master

Properly implement 62649776ca