Bug fix on data retrieval
JIRA - >http://tintin.cs.indiana.edu:8091/browse/PSU-94