Fixed in #2473