Migrated to polyamorous 1.1.0