Fixed a bug where the findShape wouldn't look in the correct order.