If it's not too complicated you can just fix it here, otherwise if you don't want to mess with it I'm happy to merge this with the `__getattr__` changes (assuming the tests pass in their existing state). If you don't find the time to do a PR, file a bug and I can fix the tests. Thanks!