fix for v2.6