Fixed issues with ticking