Added hotfix to store string value with quotes