* Applied patch for #204