Time bugfix