Fix routing - it should not rely on the TERMINATOR