Close issue #77