More robust versionconst