Update issue #16.