Fix for BROWSE-62

Fix for BROWSE-62