fix extending shapes