Fixing regression #108