Fixed in v1.6017