Issue #2347659 by rpayanm | martin107: Fixed CONSTANT needs updating.