Fixed #108 and #109.