Fix interpretation of target-mode