Fixed for App Store version