Temporary fix for multi-peers