Should this be #ifdef'd ?