Added check for Custom Values