Issue 88: Temporary workaround for SIGTERM handling