Fixing issue #203.