Solved regression in last commit