Fixed get corners and edges