Provide a temporary work around for #11