Fix for #987
Javadocs