Fix for the new protocol