Updated According to Github issues