Close issue #28