Bug fix to re-enable routing through friends