merge the baudrate workaround