Fix build - how did I not think of this solution earlier...