Made a hack by including a define - better to get rid of the static ola objects, but how?