re-apply tick fix
Merge branch 'hotfix/tick_clean_2'