Fix for WWW-1554