fixed bug 3 from Tim, added bug 3 for Time