Now with ROOT_PATH

Tested and working correctly with my test environment. Did an upgrade from 1.9.4-RC2 to RC4 to test / verify it.