Close issue #207