Hotfix/tick clean 2

Another attempt at creating the clean hotfix.  It won't have it.  @emanuil-tolev - any ideas?