Fixing escapes