changes to comply with StringUtils.java