Fix for timer issue - timer was never stopped, just new ones added
And a rather better fix
1.14