shapes bug fix