Fix multistrap issue