Another try to get thread migration right