Fixed by 8ab0b46 et 109361b