Commit reference to issue #23