Not sure that the Javadoc should be changed here ?