Adding the escape earlier in the process.