Multilib fix attempt 3