Fix for http://jira.jcatalog.com/browse/WCM-851