Solved github issues