fixes #8
complements fix to #8 w/ fully working tests