diff --git a/LinkedList.java b/LinkedList.java
index c1b1112..29020f9 100644
--- a/LinkedList.java
+++ b/LinkedList.java
@@ -25,6 +25,8 @@ public class LinkedList {
   public void toNext() {
     if (hasAccess()) {
       current = current.getNextNode();
+    } else {
+      toFirst();
     }
   }
 
@@ -47,6 +49,7 @@ public class LinkedList {
     if (isEmpty()) {
       first = newNode;
       last = newNode;
+      current = newNode;
     } else {
       last.setNextNode(newNode);
       last = newNode;
@@ -62,9 +65,8 @@ public class LinkedList {
     if (hasAccess()) {
       Node newNode = new Node(content);
       
-      Node nextNode = current.getNextNode();
+      newNode.setNextNode(current.getNextNode());
       current.setNextNode(newNode);
-      newNode.setNextNode(newNode);
     }
     size++;
   }