Hopeful workaround for #237