Fixing issue #352 properly.