Fix Macumba v0.4a