Bugfix in Tick Mode