         }
         peripheral.writeValue(matrixData, forCharacteristic: ledMatrixCharacteristic, type: .WithResponse)
         lastWriteMatrixDate = NSDate()
-        isWaitingForLedMatrixWriteResponse = true
+        isWaitingForMatrixWriteResponse = true
         
         // When the matrix write response is not retrieved within 100ms we assume the response to have timed out
         writeMatrixResponseTimeoutTimer?.invalidate()

    }
    
    private func writeMatrixNow(matrix: String?) {
        assert(!isWaitingForLedMatrixWriteResponse, "Cannot write matrix now, response from previous write request not yet received")
        guard let ledMatrixCharacteristic = ledMatrixCharacteristic else { return }
        
        // Convert matrix string representation into byte representation
        let matrixBytes = NuimoLEDMatrix.matrixBytesForString(matrix ?? "")

        currentMatrix = matrix
        
        // Send matrix later when the write response from previous write request is not yet received
        if isWaitingForMatrixWriteResponse {
            writeMatrixOnWriteResponseReceived = true
        } else {
            writeMatrixNow(matrix)
