Fixing issue #250.