Deploy: fix issue with condition (III)