Fix support for multi