iOS 7 bugfix, close #24