Fix in last commit, pt 2