Fixed in 2.1