Fix for those with bad installs + Merge

For some reason my merge didn't go through.