Fixed issue #139

Fixed issue #139