** Fixed issue #3