Refactored with a monkey patch fix to weave