Bug fix on time not working