workaround under 2.2.0