Fix Zap command