Fixed issues with special characters