Fixes #31 and makes Mangoz work