Fix issue with identifying shapes