Windup 228

https://issues.jboss.org/browse/WINDUP-228