Fixes Issue #31: "Problems with iOS 7"