Fix for data missing