[bug959270v2] - beautified