As discussed, created an issue for this under #41