Tried a fix for gitHub issues