Being fixed in 2.0