Fix issue tracking regression after last optimizations