Issue #12 strikes again...