Got it! See #163