Escaping issue

This fixes the single issue that @legastero brought up, covering the other escaping issues throws up issues with our other escaping tests so this will need to be revisited.

Fixes #43