Fixed by rev#80629