- Fixed horrible analysis slowness