Correct ONEXIT behavior.
Merge branch 'onexitprob' of https://github.com/n3phele/core into onexitprob