Fixed Issue #17