try and fix slowness issue