Fixed regression intro'd in last commit