Fixing single data set case