Fixing issue #53.