fixed on configuration change behaviour