diff --git a/bin/,gitlog b/bin/,gitlog
index eca4d08..ad98325 100755
--- a/bin/,gitlog
+++ b/bin/,gitlog
@@ -564,9 +564,9 @@ EOF
 }
 
 index_inc() {
+    _oldindex="$index"
     if [ "$index" -lt $((log_height - 1)) ] \
             && [ $((index + 1)) -lt "$(line_count "$lines")" ]; then
-        _oldindex="$index"
         _i=0
         while IFS= read -r _line; do
             if [ $_i -gt "$index" ]; then
@@ -583,11 +583,11 @@ index_inc() {
         done <<EOF
 $lines
 EOF
-        if [ "$index" = "$_oldindex" ]; then
-            # shellcheck disable=SC2015
-            forward_page \
-            && set_state action=index_inc_forward_page || true
-        fi
+    fi
+    if [ "$index" = "$_oldindex" ]; then
+        # shellcheck disable=SC2015
+        forward_page \
+        && set_state action=index_inc_forward_page || true
     fi
 }
 
diff --git a/test/test.sh b/test/test.sh
index 37f01a9..b5c3341 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -3,8 +3,12 @@ set -o errexit
 
 TESTMODE="on"
 
-src="$(echo "${BASH_SOURCE[0]}" | grep . || echo "$0")"
-DIR="$(cd "$(dirname "$src")"; pwd)"
+src=$(echo "${BASH_SOURCE[0]}" | grep . || echo "$0")
+DIR=$(dirname -- "$src")
+DIR=$(cd -- "$DIR"; pwd)
+
+bin=$(cd -- "$DIR"; cd ../bin/; pwd)
+export PATH="$PATH:$bin"
 
 bash "$DIR/photosort/photosort-test.sh"
 source "$DIR/test_add_aliases.sh"