Fixed #832: Bug - Error on new install (again)