Fix failure when msg contains equals sign