+PATCH-1099, +PATCH-1097, -PATCH-1080