Revert "Official version by MsCarrot."

This reverts commit c749b6f576f250b91b91daf0a244005a27280cfc.
Bug fixed on corners