Nice fix for customer
Extra Javadoc