Constants should be set by init action
Raise function version for Jon's fix