Fix for multi-remote with passive mode