upd for Macaw 1.5.9