Fixed #if conditions