Work around for #982