Fixing issue #47.