Fix Issue #17