Fix as per 5f3903f3d