The fix makes sense, I'll have to have a talk with @hakubo about the value of that timer and a couple of JS things (one-letter variables and the decr of array length).

In the meantime this looks safe to merge.