Start tracking on return, fixes #780 (linux)