Added ifdef guard