Bug fix: still Ctrl C issues