Finally get the #if right!!!