Fixing bug in the multi support.