Fixing time display bug