Fixed #64 and #65.