Fix specs #314

This only fixes the symptoms though, see discussion in Pull Request