And another attempt at route MP compatibility