Fixed issue with special characters.