Work around for packer issue #1656