merge bugfix from upstream which prevent segfaults in run_softpoint.x
merge bugfix from upstream which prevent segfaults in run_softpoint.x