Fix for WildFly 8.1.0.CR2