Fix 3b946c9cbd and 871295a79b