Data Structure bug fixed