Fix for issue with Timer