Tick/Cross bug fix 3.0