workaround 2.0.0/2.1.0