Fixing issue #276.