zapi fixed