Follow up patch for #200