Bug failures 7

Fixes #7