diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
index 0b294c5ae..59ee80934 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -141,7 +141,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor,
     @Override
     public NBTTagCompound write(NBTTagCompound tag) {
         if (owner != null) {
-            tag.setString(NBT_OWNER, owner.toString()); // @todo: Use proper NBT UUID methods
+            tag.setUniqueId(NBT_OWNER, owner);
         }
 
         writeConfiguration(tag);
@@ -158,7 +158,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor,
 
     public void read(NBTTagCompound tag) {
         if (tag.hasKey(NBT_OWNER)) {
-            owner = UUID.fromString(tag.getString(NBT_OWNER)); // @todo: Use proper NBT UUID methods
+            owner = tag.getUniqueId(NBT_OWNER);
         }
 
         readConfiguration(tag);