Fixing javadoc. Fixes issue 7033