cosmo: this should fix #66