i shape bugs fixed