Fixing #183: Freezing of a main thread during swapCursor