Fixed an issue with {safe: true} breaking things.