Time management fix contributed by Fluxroot (Thanks!)