Close issue #27