Fix potential serial bug