Fix #6: Last commit and threading