Fixing issue #27.