Alter Pull #3176 to follow discussion