@alastair: this also fixes your #127 then, right?