Gpii 1023

http://issues.gpii.net/browse/GPII-1023
@jobara Fixed