Fix regression, closes #611.