issue #23 and issue #21