Argh... Issue #139