Fix Issue #17

This commit fixes Issue #17.