Github issues fix