This may hopefully fixes the huge github issue