Fix bug causing confusion and Issue #146