Close issue #159