found a way to fix >=2.18 spacing issues