This one should be fixed in trunk now