Update issue #159