Fixed regression introduced in the last commit