Fixes failures introduced in 6b2dd77