Fixed armory access