#1327 - Resolved issues with custom value not saving