Fix for bug #163132 - allows multi-user/remote access to the