FIX: avoid simultanous activation of changes by means of a lock

Conflicts:

	ChangeLog