Merge "fix error in javadoc"