This commit solves: https://issues.jboss.org/browse/ROASTER-25