Further fix in issue #102