Made changes to compatible with multiarch mechanism