Fix missing conditions