Bug in the previous commit fixed.