Fix issue #23 and #27.