Fixed issue #59

Fixed issue #59
Ja