Fixed #66 and #67

Fixed #66 and #67