Fixing issue #36.