diff --git a/CHANGELOG.md b/CHANGELOG.md
index 481d555accb0ee3533897afad93e901470ba26ae..7e0920c840cb0d8f0319fb72227f527e66eb2451 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix job not ending if forked processes still running.
 
 ## [1.0.1] - 2018-01-03
 ### Changed
diff --git a/template/after.sh b/template/after.sh
index 8153a04c0087879fee52add452978e7e249430c6..b6a344ab756429605619303bfe9b00ef2184102d 100755
--- a/template/after.sh
+++ b/template/after.sh
@@ -3,6 +3,8 @@ echo "Waiting for Jupyter Notebook server to open port ${port}..."
 if wait_until_port_used "${host}:${port}" 60; then
   echo "Discovered Jupyter Notebook server listening on port ${port}!"
 else
-  echo "Timed out waiting for Jupyter Notebook server to open port ${port}!" ; exit 1
+  echo "Timed out waiting for Jupyter Notebook server to open port ${port}!"
+  pkill -P ${SCRIPT_PID}
+  clean_up 1
 fi
 sleep 2