Actually fixing time bug this time. :-)