This one should be fully fixed on trunk now