Merge pull request from umarluqman/fix/not-working-after-timer Fix/not working after timer