Issue #12. See 444aff7a7b