Fixed handling of string constants