Premature Timer End Fix