AGIOS-153

done for [AGIOS-153](https://issues.jboss.org/browse/AGIOS-153)