fix shapes handle