Multilib fix attempt