Wait for #682