Should fix #2 in mangos-zero