Probably put this under the ifdef below?