Fixing issue #164.