Possible fix for non alphanumeric characters, needs testing.