configuration change handling was fixed