Should be fixed in r9949