Fixes regression from 299f5b2b770648d

Fixes #870