Fix for WWW-1444