fix for v1.580