Fixed by commit c2c8660