** Fixed issue #34