Fixed a regression in a recent commit.  Address #37