Fixing bug introduced in last commit.  Probably fixes #387.
Updated