Solution for https://issues.jboss.org/browse/AEROGEAR-1000