Support for the invasion system fix