Fixing issue with handling string values