There's still a bug in stripEntities
Not really better