patch for bug until its fixed in main repo