diff --git a/android/src/main/java/com/horcrux/svg/RenderableView.java b/android/src/main/java/com/horcrux/svg/RenderableView.java
index 11d8e381..181a5dd3 100644
--- a/android/src/main/java/com/horcrux/svg/RenderableView.java
+++ b/android/src/main/java/com/horcrux/svg/RenderableView.java
@@ -119,6 +119,7 @@ public abstract class RenderableView extends VirtualView {
     if (fillType.equals(ReadableType.Map)) {
       ReadableMap fillMap = fill.asMap();
       setFill(fillMap);
+      return;
     }
 
     // This code will probably never be reached with current changes
@@ -190,6 +191,15 @@ public abstract class RenderableView extends VirtualView {
       invalidate();
       return;
     }
+
+    ReadableType strokeType = strokeColors.getType();
+    if (strokeType.equals(ReadableType.Map)) {
+      ReadableMap strokeMap = strokeColors.asMap();
+      setStroke(strokeMap);
+      return;
+    }
+
+    // This code will probably never be reached with current changes
     ReadableType type = strokeColors.getType();
     if (type.equals(ReadableType.Number)) {
       stroke = JavaOnlyArray.of(0, strokeColors.asInt());
diff --git a/android/src/main/java/com/horcrux/svg/VirtualView.java b/android/src/main/java/com/horcrux/svg/VirtualView.java
index 42f29c0f..7e5adcc1 100644
--- a/android/src/main/java/com/horcrux/svg/VirtualView.java
+++ b/android/src/main/java/com/horcrux/svg/VirtualView.java
@@ -305,7 +305,8 @@ public abstract class VirtualView extends ReactViewGroup {
   public void setMatrix(Dynamic matrixArray) {
     ReadableType type = matrixArray.getType();
     if (!matrixArray.isNull() && type.equals(ReadableType.Array)) {
-      setMatrix((ReadableArray) matrixArray);
+      ReadableArray matrix = matrixArray.asArray();
+      setMatrix(matrix);
     } else {
       mMatrix.reset();
       mInvMatrix.reset();