VOL-20 - Use constant instead of value