Make it compatible with ZAP!