Multilib fix attempt 2