janky fix for speed