Fix 740662f regression (thanks kieran kulkarni)