GPII-671: Fixed spacing