1st attempt in fixing ticking entities bug