[6.16.z] Update fill method logic for button values

[6.16.z] Update fill method logic for button values #1651