Trying to fix issue related to https://jira.codehaus.org/browse/MRELEASE-867