Resolve issue #102