Fixing regression #167.