Applied the fix from http://jira.codehaus.org/browse/CHEN-2