workaround, to be fixed upstream