Fixes Issue from Pull Request #175.

Fixes Issue from Pull Request #175.