Less threading (fix)