(TXT) fixes-210420.patch