Fixing regression introduced by 288fa8be6f977694b7ada5d7f3f078975f3da38e