fix old versions support