bug fix + shape