fixed issue with data synchronization