Remove fix for edgecase as it's not a good solution