Fixed Timer issue