Gpii 878

http://issues.gpii.net/browse/GPII-878
the indentation here seems to be off as well.