fixed shape bugs