Fixed edgecase