Fix https://github.com/Axway/Grapes/pull/28