Fixed bug in DataDelegate