Work around for #32