put more ifdef around curls