Bug fix for times