Deploy: fix issue with condition (II)