I just pushed a fix for this, so it should be better now, its also optional now