fixed issue with change detection