Improve escape performance