Temporary fix for #13, and others