I think the refactor is working... solves an issue too