Close issue #69