fix for Issue 3

Before merging this pull request, restore the full test line-up