Fix for regression introduced in last commit