Fix issue #25 and #26.