bug Fix for data error