Temporal workaround for #2070