Fix legacy v3 support