Trying to solve github issues..