fixed upper right edgecase