Fix place for adding ChangeLisener