Fixed minor issue with timer