time bugfixes