Fix for http://jira.codehaus.org/browse/ACT-1879