Fix for XWIKI-9001