Added fix for Issue #200

Another option is to hardcode the architecture, but that is somewhat
less flexible.