BUGFIX: Issue #1, Not terminating properly