Close issue 95