fixes #98 - fixed some incomplete logic from those dark days before github.....