Re-enabled shape count check.