ZAP command cleanup (possible bug fix).