Fixes shape removal