Fixed 67 and 72

Fixed #67 and #72