Fixed for 0.12 nightly