Github bug fix part 2