Gpii 878

http://issues.gpii.net/browse/GPII-878
@jobara Yes, indeed.