Issue #12 seems to be fixed