Fixed data displaying bug