Fix conditional (2)