Fixed issue #135 and #114