Fixed issue with shared data