adding fix described in http://jira.codehaus.org/browse/MRELEASE-812