Make it compatible for ZAP!