Time bugs fixed