fixed threading in v1.24