Fixed Issue #17

Fixed Issue #17