Another go at #6

Should fix the over-escaping problem with #6