Fixed issue #70
Fixed issue #64