Fix yet another multiple symbol defintions error