Fixing issue #194 for now.