Fixed performance issue. App Store Build #2