Chatted with Andrew - he's going to try another approach to avoid this.