Fixed issue #2

Fixed issue #2