Issue/2596 fixes coredata threading glitch

Fixes #2596