Refactor, same issue...