Fix BrowserCMS issue #562