Added temp fix to thread issues.