Fixed Issue #26

Fixed Issue #26