Fixed regression introduced in last commit